merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 24 Dec 2010 02:30:43 +0000 (11:30 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 24 Dec 2010 02:30:43 +0000 (11:30 +0900)

Trivial merge